Remove some redundant code
authorMatthias Clasen <mclasen@redhat.com>
Fri, 26 Sep 2014 13:40:30 +0000 (09:40 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Fri, 26 Sep 2014 13:50:33 +0000 (09:50 -0400)
No need to check the same widget twice in a row for being a window.

gtk/gtkmain.c

index 1fa3cf02cc034ea8da03ade69554b8699921d3fe..d8c344f750412380cb0811bd8df54dc07e6f383b 100644 (file)
@@ -2502,15 +2502,9 @@ propagate_event (GtkWidget *widget,
           if (widget != window && gtk_widget_has_grab (widget))
             handled_event = propagate_func (widget, event);
 
-          if (!handled_event)
-            {
-              window = gtk_widget_get_toplevel (widget);
-              if (GTK_IS_WINDOW (window))
-                {
-                  if (gtk_widget_is_sensitive (window))
-                    handled_event = propagate_func (window, event);
-                }
-            }
+          if (!handled_event &&
+              gtk_widget_is_sensitive (window))
+            handled_event = propagate_func (window, event);
 
           g_object_unref (widget);
           return handled_event;